Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed timecourse from types and added to biomaterial core. Fixes #1511 #1529

Merged
merged 4 commits into from
Aug 22, 2023

Conversation

willrockout
Copy link
Collaborator

Release notes

This is a remake of PR #1513 to clean up the commit tree.

For core/biomaterial/biomaterial_core.json schema:
-Added timecourse module

For type/biomaterial/donor_organism.json schema:
-Removed timecourse module

For type/biomaterial/cell_suspension.json schema:
-Removed timecourse module

For type/biomaterial/cell_line.json schema:
-Removed timecourse module

Reviews requested
-Major change, removing timecourse module from donor_organism, cell_line, and cell_suspension.
-Minor change, adding timecourse module to biomaterial core.

Fixed description to be more general.

Co-authored-by: Hannes Schmidt <[email protected]>
Copy link
Contributor

@hannes-ucsc hannes-ucsc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this have been

@@ -61,6 +61,7 @@ supplementary_files | A list of filenames of biomaterial-level supplementary fil
biosamples_accession | A BioSamples accession. | string | no | | BioSamples accession | | SAMN00000000
insdc_sample_accession | An International Nucleotide Sequence Database Collaboration (INSDC) sample accession. | string | no | | INSDC sample accession | | SRS0000000
HDBR_accession | A Human Developmental Biology Resource (HDBR) sample accession. | string | no | | HDBR accession | | 34526; 14758, 2, liver
timecourse | Information relating to a timecourse associated with this cell line. | object | no | [See module timecourse](module.md#timecourse) | Timecourse | |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
timecourse | Information relating to a timecourse associated with this cell line. | object | no | [See module timecourse](module.md#timecourse) | Timecourse | |
timecourse | Information relating to a timecourse associated with this biomaterial. | object | no | [See module timecourse](module.md#timecourse) | Timecourse | |

I thought the documentation was automatically generated from the schema, so making the schema change I proposed in my previous review should have automatically caused this line to be updated, too.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it is automatically created with Git hooks upon a push but I'm not 100%. It seems to not work from a GitHub commit.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to not work from a GitHub commit.

Well, that's a problem.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Procedural comment: The author shouldn't resolve reviewer comments. Reviewers resolve their own comments when they feel they have been addressed.

From the SOP:

If you accept the PR author's response to a comment made by the reviewer, mark the comment thread as resolved on Github.

Copy link
Collaborator

@ESapenaVentura ESapenaVentura left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!! Just a question - Based on the comments above, do I take that you manually corrected the docs/jsonBrowser/core.md doc?

@hannes-ucsc
Copy link
Contributor

hannes-ucsc commented Aug 1, 2023

@ESapenaVentura, in my experience, commit hooks aren't a good enforcement mechanism, simply because they can easily be bypassed. What we do in our projects is make the code/doc generation part of our build process and then have a validation step in our GitHub Actions workflow that tests for a dirty working copy. If the author of a change forgets to run the code/doc generation and commit the result, the code generation will dirty the working copy on CI/CD and fail the GitHub Actions workflow. This has worked very well for us in a number of different scenarios. For example, we also detect stale transitive Python dependencies that way.

@willrockout
Copy link
Collaborator Author

@ESapenaVentura Yes I changed it from the command line on my local copy then committed and pushed the change but for the change to the biomaterial_core.json I made the change on Git Hub.

@willrockout willrockout merged commit 6e34911 into staging Aug 22, 2023
1 of 2 checks passed
@willrockout willrockout deleted the ws-add-timecourse-to-biomaterial-core-Issue1511 branch August 22, 2023 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants